Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Mon, 12 Jul 2010 13:21:11 +0000 (13:21 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Mon, 12 Jul 2010 13:21:11 +0000 (13:21 +0000)

Trivial merge